From: Ilmari Karonen <vyznev@users.mediawiki.org>
Date: Thu, 5 Oct 2006 14:55:41 +0000 (+0000)
Subject: use ImageMagick -thumbnail option instead of -resize
X-Git-Tag: 1.31.0-rc.0~55618
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=0471eded8a269939fe1cbfef52fbe8ebb8a0a73f;p=lhc%2Fweb%2Fwiklou.git

use ImageMagick -thumbnail option instead of -resize
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f164ab887e..32e1ab065c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -266,6 +266,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7004) PHP iconv() notice on bad password input to Special:Userlogin.
 * (bug 6826) Extend pre-save transform context link ("pipe trick")
   syntax to pages with commas in title
+* Use ImageMagick -thumbnail option instead of -resize to avoid including
+  excessive metadata in thumbs (requires ImageMagick 5.5.8 or newer).
 
 
 == Languages updated ==
diff --git a/includes/Image.php b/includes/Image.php
index 0754f67ac1..55e53e267a 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1211,7 +1211,7 @@ class Image
 					// For the -resize option a "!" is needed to force exact size,
 					// or ImageMagick may decide your ratio is wrong and slice off
 					// a pixel.
-					" -resize " . wfEscapeShellArg( "{$width}x{$height}!" ) .
+					" -thumbnail " . wfEscapeShellArg( "{$width}x{$height}!" ) .
 					" -depth 8 " .
 					wfEscapeShellArg($thumbPath) . " 2>&1";
 				wfDebug("reallyRenderThumb: running ImageMagick: $cmd\n");